]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
st-theme-node-drawing: Fix implementation of background-size
authorJasper St. Pierre <jstpierre@mecheye.net>
Thu, 2 Feb 2012 11:30:14 +0000 (06:30 -0500)
committerJasper St. Pierre <jstpierre@mecheye.net>
Mon, 6 Feb 2012 13:01:33 +0000 (08:01 -0500)
It seems that accidentally, two variables were swapped in one code path
of the background-size implementation, causing interesting but wrong
images for some elements.

https://bugzilla.gnome.org/show_bug.cgi?id=633462

src/st/st-theme-node-drawing.c

index 12d86d3de5fe749e9d120cc4c01b4af3b2b766b5..08531c7e3084fe9859b6086f469ead23a1dc43f9 100644 (file)
@@ -469,12 +469,12 @@ get_background_position (StThemeNode             *self,
   gdouble scale_w, scale_h;
 
   /* get the background image size */
-  background_image_width = allocation->x2 - allocation->x1;
-  background_image_height = allocation->y2 - allocation->y1;
+  background_image_width = cogl_texture_get_width (self->background_texture);
+  background_image_height = cogl_texture_get_height (self->background_texture);
 
   /* get the painting area size */
-  painting_area_width = cogl_texture_get_width (self->background_texture);
-  painting_area_height = cogl_texture_get_height (self->background_texture);
+  painting_area_width = allocation->x2 - allocation->x1;
+  painting_area_height = allocation->y2 - allocation->y1;
 
   /* scale if requested */
   get_background_scale (self,